Feature/own delete