Cleaning up some garbage