Added URL unshortening support, cleanup