removed eclipselink, added sql2o