Revert "Added waiting to connect and newer file format."

This reverts commit 93c67e244f0ee8eed9d4733c27c157c19fa3eff8.