`preset` is always present
Cleanup
Pass entity directly
Cleanup