CSS clean-up + removal of media queries