Remove other unneeded temporary variables