[960987] Part 2: Removed cls