clean up self.servers
Merge pull request #23 from fly/with_statement

clean up self.servers