cleaning up some db operations for rollback to 5.3
cleaning up some db operations for rollback to 5.3