First step towards 1.8 support

Scrap 1.7 support in the process