Clean up schema use