Move sets.edit.delete to sets.delete
Cleanup & fix imports