Move delete into manager class