remove static method and message altering