Remove dependency on hibernate