Re #10803 Comments and removed outdated pieces of code