Pin map definition cleanup.