Merge KillerSmurf's cleanup