cleanup existing container handling