Cleanup
Import HermiT Library + Merge in progress
Merged