Removed uneccessary variables