IDEA-80056 cleanup