remove some unnessecary vars.