Removed assets
Merge branch 'fixes'