Cleanups as part of the Helios project.

Removing unused extensions - code never executed, never even included.