Clean up v1
Clean up gsl imports
More niceness
Cleanup
Much cleanup