Remove files, group problem spaces together later on