Remove base-url adoption