WIP on sass cleanup