add timeout hack, remove old crap that accidentally got left in and broke things