work in progress removing hibernate