Fix more warnings from #579

@shuffle2 Which code is it? Is there any point in keeping it around, or should the commented code simply be removed?