remove additional references to Container