Remove no-longer-used concrete implementation of a method
Some renamings + final->const
Merge pull request #3831 from ussuri/minor-cleanups

Minor cleanups