Database: Cleanup; Add Users table

Change-Id: I2db3490cfa156c913a95b525a7db4a3ab6859cc2