Remove static methods