Update DocBlocks
Remove unnecessary piece of commented out code

[ci skip]