Stripped out older deprecated junk