AppNexus E2E: Improved helper and general cleanup