Remove obsolete resolver
Clean up / make it compile