Cleanup code and add more comments

For D7 branches, the old commented-out D6 code needs to be removed. For all branches, any old commented-out code needs to be removed and any uncommented functions need to be commented. The code could be run through coder review as well.