Remove done 'TODO'