Moving towards using common database
Cleanups
updates