Remove 186 support

More removing 1.8.6 workarounds, as we wont be supporting it in version 3