CK-15084 cleanup