remove useless entities
Merge remote-tracking branch 'origin/master'
redo jpa test entity set