WIP : stripped obsolete comments