Refined, testing with unconditional rb delete fixup