cli: Cleaned up device checks