ref #77 : deleted resolved TODO comments