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