Add delete to Location and Gateway