Merge "Various database class cleanups"