Intercom, clean up and work on Bitly fix