remove static references