TODO: Deps
Tweaks for the delete