cleanup of PrimaryKeyProxy and HibernateMappingExporterProxy