Cleanup EideticRequestMonitor
Merge pull request #3056 from davidegrohmann/2.1-cleanup-eidetic-req-monitor

[2.1] Cleanup EideticRequestMonitor