Cleanup + fix Jumper network