Added Benchmark Timer and Updated Cleanup code