cs markup cleanup