Remove references to base in Resolver