clean-up of redundant outcommented stuff.