Merge "Remove unused getter"