Bro, when I left in 2017 I had to go with my employer to the labour office to cancel my wp. But then the officer informed me that I wasn’t needed as my employer could have cancelled it.
No problem, once you get a new passport the non B will be transferred to the new one. Immigration will do it for you as your embassy will give you letter to show the immigration office.