Cleanup
Use jmuheim/gaffe while PR open