Unneded EJB stuff removed