Crazy attempt to fix duplicaton issues in prod