removed t and f references