removing unecessary macro