Work towards gutting AppFSd to rewrite