Rename onRemove to onDestroy.