Delete: improve deleetion