General cleanup, remove unused imports.
Clean up MeasureSource
Clean up Contributor and Personnel