Remove last remnants of daisychaining