assets cleanup
Merge branch 'feature/content'