Location nulling moved to Destroy() proc