Improve rendering performance; remove timing instrumentation from code