Schema clean up.