Remove use of "staticmethod"