remove use of keyedtuples