Fix container removal