More improvemnts to clean unloading support