Timing function tweaks. Strip dead code.