Remove errant dependent: destroy
Todos and fixes from code review