#61 Ads namespacing for delegate callbacks
#61 Remove some orphaned code