The info removal code was overcomplicated, and error-prone (references being wrongly...