Refactor and prevent scss generation in 3.2