Merge "Remove unused fields and imports."