remove needless variables, again