Removed CustomSql.java and DatabaseStats.java. Sql is still public static final