Remove unused comments
Merge branch 'dashboard-feature'