Deletion tidied up