This seems like a classic case of misplaced comments: Comments in place X describe what is going on in place Y. As place Y evolves, no one expects that there are comments elsewhere describing how place Y works.
I've also addressed some style issues.