Container registration tidy up. Container now listens to desired target change and clears registrations if appropriate.