Cleaning up remaining timing fucntionality.