Cleaned up old commented-out cruft in drawing code