Code Cleanup

Performed some code cleanup. Removed the evaluation timer.