famille almost cleaned (some TODOs left)