Remove identity api dependency