Remove const_cast
Remove commented out line
Merge pull request #5006 from ianna/dd-remove-const_cast

Remove const_cast