Clean up
Implementing Intercom and Crypto