Remove Timex dependency