Issue IKTRE-103 by tuj: Fixed shared channels push. Cleanup