fix last changes and remove timeout