removed table stuff that's menat for #316.