Clean up database.properties and dataModel.properties