removed leftover assets
Merge remote-tracking branch 'upstream/master'
removed stupid stuff