better cleaning for url purposes
terrible, terrible tests, but tests nonetheless