Exchange 2013 Public Folder Nightmare

Exchange 2013 CU 23

Long story short, we lost all of our Exchange servers and had to engage in disaster recovery. Everything seemed to recover smoothly except the public folder mailbox. We recovered the original mailbox to a new server (DB now has a  different name) but I can't get the system to point to the new location. I even went into ADSIEdit to clear the old MSExchHomePublicMDB entry which didn't seem to do anything. We don't use public folders anymore so if it's possible to just remove all remnants of it I would prefer that, but if we have to recover and then remove then I'm up for that. All I know is it's driving me crazy because it's the last bit left from the recovery that otherwise went smoothly.

Old Server: Server1
Old Database: User1
Old Mailbox: Mailbox1

New Server: Server2
New Database: User2

Note that when I search the recovered db for a public folder mailbox it doesn't find anything, though it has to be there since it's the same db under a different name. Public folders have always been the bane of my existence.