Removing all the old stuff from the early Python implementation