Remove TBB ifdef form code