* Remove some cleanups and instead keep the relationships as part of the main object life cycle.
