removed unecessary variables