more container related cleanup