WSOTWO-91: code cleanup