Clean ups

minor changes:
* pom cosmetics :lipstick: 
* move CDI out of Server into JPA
* removed out-commented line