Clean up the schema for server_type around shares