cleaned up client initilization for existing commands