Merge dev to master

Deleted the localhost endpoint in the ws service