Eliminate static methods