generation strategy set to identity for entities
further code cleanup