more refactoring of buildDelete...