Remove ID API and fixup config