Cleaning up some things.

Just removing comments, bundling classes together.  Removing obselete
things.  Also, working on a headless environment feature.