Drop container-api and runtime-util references