Partial removal of file_sector type