Getting rid of EJB...