Remove shims dependency