Remove usage of old gfx