Remove stub marker macro and calls.