New Pull Request from Octavio

More code cleanup, mainly deleting comments by previous groups, getting rid of unused comments and code that has been commented out by previous groups.