MattiaFortunati Improvement to assets deallocation