Remove 1.8 compatible code