Removed unncesary variables