Tidy up
Remove deprecations
Fix ws
Fix ws
Cleanup
Fix ws
Cleanup
Remove deprecations
Removed deprecated functionality
Update changelog and version ready for release