- CS, Get rid static call checkings