space cleanup, bugfix JPA entity creation