Cleanup DatabaseHelper.java