cleanup
Merge pull request #3775 from civanch/magfield_gen_cleanup

Sim -- Cleanup