[wip] Improve/remove fs