Remove dependence on time