More pipeline cleanup.