Removed CLI class stubs