remove timeout stuff for now