remove redundancy, reorganize schema