Removed unnecesary macro