Cleanup per msftidy report of Spaces at EOL