Remove redundant casts, use make_uique, use 'using'

Remove redundant casts, use make_uique, use 'using' #1954