Removed gfx device dependency