Remove the dependency on the Filesystem package