Fixed doddi de-stroyer refactoring stuff