Cleaning up the asset structure