Improving and testing remove functionality
Autocommit Mon Nov 17 12:29:57 EST 2014