fixes some schema problems, removes unused fields. Closes #2110