entity cleanup (always map storage idx to uid)