cs clean-ups