Clean up EJB2 code