Minor Cleanup

Get rid of some old code.  Comment some methods