Cs fixes

Is your thinking that removing it makes it harder to add wrapping html in the future?