Merged with 'admin' and completed deletes