Remove unneeded 1.8 support