remove EmailBundle dependency