smurf: Clean up better