remove commented out cruft
remove more commented out cruft