Cleaned up a bit, during unit production removal, no longer adds duplicates