Unfuddle obsolete code removed