Killing a piece of overengineering