CLI is now allow for delegation in model, so removing instances of it