Cleanup and Speedup