Fixing that removeSafe operation is not executed eagerly
Autocommit Sat Nov 15 20:58:29 EST 2014