cleaning maps
fixing @EJB vs Static hell