Removed unused macro
Let pmap handle it