remove unneeded _assets
Merge branch 'master' into classRearchitecture