Remove Shuttle/Container dependency