this change did NOTHING to simplify the job, it did the complete OPPOSITE.
It need to be reverted, plain and simply.