finish schema cleanup