Removing unneeded vars