Enh: Remove self in staticmethod