Cleanup of some URL stuff