Remove unused fields.
Remove unused function.