More timing cleanup