Remove FileSystem.move; FileSystem-related cleanup