Got rid of unneeded vars