deletion functionality improved