Hopkins: More cleanup commits

As the title says... more cleanup commits!