remove references to the core form hibernate implementation