Clean up schema