Divorce OpenPOP from OpenDSA