Remove clone fix and use different keys instead.