Replace enumerate/index with direct references on mutable objects
Remove every relationship instead of every second one