more asset cleanup / refactoring