this looks like a bug-fix, not just cleanup