some clean-up, again, check relationships between objects