Cleanup

This PR removes the Jeweler dependency and does some cleanup.