Remove unused parameters
Prepare infrastructure for record/replay of exact network traffic