Remove code that was not ready-bugproof yet (#5286)