refactorings and delete actions