Cleaned up schema updates