Some cleanup, time measures.