Clean up the remove method