Remove 2.6 specific functions