Old code removed, all tests passed.