More fs cleanup