Fixed include cycle and removed unnecessary save_selected_as_json