cleaning up rollback code