Assorted graphics related clean up.

Includes removing excess headers, and a few redundant comments.