Remove unused references and inject IFileSystem