Eliminate now-dead code (special cases for pg 8.1)