Clean up Mitm implementation
Almost working vanilla restarting feature