Cleanups as part of the Helios project.