remove the commented lines from the commits and rewrite later.