streamline. cleanup.