Instrument server performance 3.3.15

Revert client simulation code + some fixes