CM: Remove excess comments