SDL/SDL2 gfx clean ups