refactor schema -- remove unneeded table