Remove component and rename deactivate to willDestroy