remove old things that don't fit with the current direction
improve comments
more realistic timeouts