Cleanup old URL-feature work