Removed SQL statements from database file and moved statements to dca files