Cleaning up remove