remove static reference to mapper