Update URLs and cleanup