Code cleanup (from SVN days)
Cleanup of old SVN comments