pff: permission spoofing - location
pff: infrastructure code cleanup