remove non-JPA generators
code cleanup due to code deletion
restore generators (requested by Morris)