Removed gfx directory (no longer used). General cleanup of marker code