Removed trailing commas and unwanted include