Deletion and some other small fixes