Remove old API in CLI Router