Deleting old cruft
Changing timeout
no clue