Fixing that removeSafe operation is not executed eagerly
Autocommit Mon Nov 17 07:35:57 EST 2014