Remove leftover line

This line should have been dropped in the previous commit.
Remove another leftover line
Tidy up those two loops