...and some further clean up. Change-Id: Id294c0f38fe0041646fc86cacbd2e19734c746a9
Contains database pieces, drivers, etc.