Drop some deprecated stuff that was missed.

These were marked in scaladoc as deprecated; we'll backport a proper
deprecation warning to 2.6.