Related to #1067 (closed)
As per the linked issue, we had some duplicates, so this cleans up what Axil found.