Removing old macro