removed tclab; header cleanup; added pair_list_functor although it is not yet used.
fixed merge conflict