I disagree with this part "and clean up all the unnecessary CS."
~
All CS is necessary CS.