Remove 2.6 compatibility