Removing unnecessary sass complexity and unused fields