got rid of loops and double links
Authored by: vsp_neumann 2012-04-04
Parent: [r19044]
Child: [r19046]