Continue cleanup of options
Remove random order option
places() -> places_by_insertion, places_by_id() -> places()