Clean up gfxdemo