move static methods to the class that actually uses them