simplify tables, no more key classes