Refactoring: Remove FileSystem shim loader