Removed uneeded vars