Removed t-var usage on 36