Clean up schema logic