WSOTWO-120: code cleanup