Remove allow trailing comma, and instead remove whitespace only fields