Removed unnecessary varibles