simplify table structure - remove old code