bundle: removed discover.el
jabber: removed code duplications (macro introduced)