Merge "Removed unused fields"