Fix bundler gems and broken migrations
Finish pruning unneeded ad code
More ad fixes