Moved entry key cleanup from feed_normalizer to it's own function