Merge "Removed unused class fields to prevent static analyzer warnings"