Refactoring+simplification [AMECHE-326]
Changed code to take P-Served-User from headers [AMECHE-326]