Removing references to oneid