implementing final TODO, removing incorrect comments