Remove commented out code and move GeoIP to run()