removing un-needed vars