Map|Client: Continued cleaning up particle generator management