Remove comment features (and related tests)