begin refactor, remove assets