 		selectedConnection = c
 	}
 
-	// Don't look at me, this isn't right. Not at all, I know that...
-	// This will be kicked very soon, I've just never touched pretty NSURL awesomness before^^
-	func cleanupURLString(dirty: String) -> String {
-		var string: NSString = dirty
-		string = string.stringByReplacingOccurrencesOfString(" ", withString: "")
-		string = string.stringByReplacingOccurrencesOfString("ä", withString: "ae")
-		string = string.stringByReplacingOccurrencesOfString("ö", withString: "oe")
-		string = string.stringByReplacingOccurrencesOfString("ü", withString: "ue")
-		string = string.stringByReplacingOccurrencesOfString("Ä", withString: "Ae")
-		string = string.stringByReplacingOccurrencesOfString("Ö", withString: "Oe")
-		string = string.stringByReplacingOccurrencesOfString("Ü", withString: "Ue")
-		string = string.stringByReplacingOccurrencesOfString("ß", withString: "ss")
-
-		return string as String
-	}
-
 }


	func update(callback: () -> Void) {
		if let vz = stopDict[selectedStop] {
			let requestURL = "http://widgets.vvo-online.de/abfahrtsmonitor/Abfahrten.do?hst=\(cleanupURLString(selectedStop))&lim=30&vz=\(vz)"
//			NSLog(requestURL)
			Alamofire.request(.GET, requestURL)
				.responseJSON { (_, _, JSON, error) in


import Foundation
import Alamofire

// Easy way of getting a URL fit version of a string from itself
private extension String {
	var URLEscapedString: String {
		return self.stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLHostAllowedCharacterSet())!
	}
}

class ConnectionManager {

