Some schema cleanup.