Cleanup Times code