Remove duplicated shell client