Remove graphics code, cleanup commented code.