More cleanup in graphics