remove static usage - part 2