form cleanup db.xml additions