Update delete locations to use new database query helpers.