Some more cleanup of ids