Additional cleanup after the introduction of StoreChannel