Merge "Remove code duplication in delete methods"