Please take this block comment out too. The JIRA is sufficient. 

The reason is that I don't like to use our codebase to have discussions about code structure. TODOs are OK but having discussions in comments just leads to junk that we have to maintain over time.