Speedmaster heads revisited.

Hey @toolmanmike time for a cleanup again!