deleted extra un-needed vars