Fix the clean() method so that it doesn't spit up garbage unnecessarily