Cleanup and critical ping pong feature