Do I Need to Cancel My Non-B Visa and Work Permit Before Affixing My Elite Visa?

Hi Tod, I've been approved and paid for Elite Visa and have appointment in BKK for affixing in my passport on 30th July. My non-B expired on 4th July, but work permit has another year left. So as of 5th July I've been on amnesty. I'm getting mixed messages about whether I need to physically go to Phuket Immigration to cancel my current Non-B BEFORE going to BKK. The Elite Visa staff are telling me two different things: a) it is already expired, nothing to do, and b) it needs a visit to Phuket as mentioned above, as this is where it was issued. Also, can I assume that my Work Permit will automatically be cancelled or do I also need to visit DBD office in Phuket too. I'm told that if everything is NOT in order, and i can't provide the appropriate paperwork (whatever that may be) then BKK Immigration will refuse the visa. I will have a day to get everything organised or leave the country. Any advice gratefully received