Clean up relation create/update