Remove files, group problem spaces together later on
Remove files, group problem spaces together later on