Cleanup player argument matching in loops
Cleanup ess cleanup timestamp matching