Removed a bunch of unnecessary code from the DatabaseHelper class
Merge remote-tracking branch 'origin/master'