Remove file system refactoring from API