Removed many commented lines - that's what version control is for! +one or two misc.