Remove hacky db code
Merge