removed old 2.7 code