Removed unecessary variables