Refactor to include OnComponentWillBeRemoved.