Bob cleanup round 1