Remove deprecated API usage
Rewrite whisper to remove deprecated Command API usage