[Do not merge] Cleanup

Pulling in @j2sol cleanup branches for combined Jenkins run.