Removed unnecesary variables