Tried to clean-up the instrumentation code, but currently not working.
Fixed the problem in Scheduler.cpp. Cleaned-up the pass files too.