Clean up graphics core a bit