clean-up for the YCM branch.