Got rid of unused vars pre-squash