Legacy bug code is DEAD...for now