Remove dependency on mcli