Remove dependency on timed