Updated Unload functionality (P.Skowronski)

No match.