Remove all public static calls