Enhancement container cleanup