FIX: take out extra dedup