Throughput clean up