Remove 1.8 specifics