Removing PDB statement and cleaning up hotfix with test support.