Russia and China dropped from skating Grand Prix calendar