Remove supervisor dependency
Fix delete button