8.17: lots of cleanup.