Misc cleanup
Defeat SNI