Remove Zopim and Analytics refactoring