Removed debug info + added perf timer