Cleaning up more garbage