Removed EJB code