cleaned up urls schema