remove unneeded state variables