Avoid complicated use of chain when we can just iter
Remove commented lines from development