add missing return
- do not remove components linked to the latch output lists
- remove some cloning calls
- clone latch outputs a bit better