Enhance cleaner array
Temporarily disable NAME/PW option - caused problems.