sep-019: remove TODO section (settled down with class method)