Cleanup and Perf Tests