CSS clean-up and optimization