remove some un-needed vars