Fix cleanup container not remove container bug

100% cover