WP-4562: Remove some more panopoly specific items.