Removing Calc stuff from Sig Cascade