Removed unneccessary variables