Improving and testing remove functionality
Autocommit Mon Nov 17 13:32:57 EST 2014