Remove the imap check