Cruft in forward_admin_settings()

lol, I also just noticed this.

Patch #1 above, just needs to be reviewed.

Appears to still be an issue in 6.x-1.21 and in a couple other functions as well. I can take it from here unless you want to expand the patch yourself.

@john.oltman Are you sure the above patch was ever even committed?

No, it wasn't committed, that is why I am asking - do you want to expand your patch from #1 to cover all the places there is unused similar code and post a revised patch here, or do you want me to take your patch from #1 and expand it myself. I am happy to take the baton from you at this point and commit an expanded patch within the next week. But I am asking in case you wanted to figure this out on your own - didn't want to step on your toes if you are nice enough to help out. Either way.

Ah, understood. Feel free to expand the patch, I won't be looking at this stuff for a long time anyway :)

Committed and will be in the next nightly build.