small clean up

comment out some of brass tacks that we likely won't need.

other little piddly things.