Remove CMPopTipView
merge conflicts resolved