Streamline and dedupe