uneeded vars deleted