Cleaned up schema definitions