Removed or moved code that doesnt belong in the database helper