committed old change remove_timeout()