Completed cleanupo and upgrade of upstream SCSS