Cleaned up FileSender spaces, 4 to 3