Reformat.
Remove deprecated member funcs.