Unfortunately trying to clean up a mess creates another bigger mess

Hmmm ... maybe it's because you're still using "Mr War".

How about trying a new, different, more powerful and effective, non-toxic - hey, maybe even environmentally friendly brand of "cleaner"!?