Merge "Remove extra comma"