- Cleanup SharkCliDriver part2