remove a bunch of unneccessary vars
2.5.2