Cleaned up the FilesystemInterface