A touch of cleanup