Cleanup and added de-duping for order