Clean up imap-2007f