CS - removing unnecessary comments and actions.