Kill unused macro and reimplement it for that single context it can