took out temporary nt.table workarounds