Remove 186 support

Remove 1.8.6 hacks... it's time...