Un-export and deprecated CLI-related functions (will be removed soon)