Remove unused referrals. Upgraded ObjectCreator for added flexibility