#1 Got rid of the old code, now that it is committed, and available via pull.