Remove static method (see #231