Remove all commented lines from these files
More removal of all commented lines from these files
Minor fixes