asset cleanup
merge