Tidy up to remove URL