Delete some comments
Testing
Merge branch 'design'