Cleanups in ads code
Fixing cleanups in ads code;