(Issue 3565) Remove unused CSS and reordered