clean-up extra CVS indicators (second round)