Cleaning up what is no longer being used