fix merging of schools
cleanup