CON-1447: Scss cleanup