ws: Removed unused object variable and code related to it

Fixes #670
Closes #690

Reviewed-by: Stef Walter <stefw@redhat.com>