fixed merge error and cleaned databaseutil

[AlbertBChung]

There was an error with the original nocircle merge that lost some of my commits.. Also cleaned up database util fake data