Cleanup: Removed obsolete FS1 file_s/filehandle_s, cleanup