remove unneeded vars