Some cleanup, no change.