removed t mapping for TODOs