getting rid of more CM shit