Revert "Country data on mouseover, cleanup, polish, etc"

This reverts commit 9bf5accea9ca3ebbd4388db2d1639cc025e8bdc9.
Manual merge