[[ Bug 13465 ]] Fix more memory leaks due to containers not being deleted