Unnecesary defined vars deleted