Added size checks after deleting