More cleanup
Cleanup, removal of unneeded method. Comments to ease update-merge.