Remove unnecessary resources and UI polishing