Update changelog
Bump version for release
Clean up ws
Fix redeclaration warning