refs #6096 comments and removed commented parts of code