baseurl should not be needed at all anymore.