WSOTWO-114: code cleanup