More clean-ups