OS-2357 cleanup