Clean up
New Mitm implementation