Removed lots of commented code left over from figuring out how to work
different things.