remove timeout and added some warn messages