diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 71e57e1dd7..f59997a933 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -466,7 +466,9 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can
         */
 
 
-        // Safeguard against situations where process() goes haywire when autopunching and last_recordable_frame < first_recordable_frame
+        // Safeguard against situations where process() goes haywire when autopunching 
+        // and last_recordable_frame < first_recordable_frame
+
         if (last_recordable_frame < first_recordable_frame) {
                 last_recordable_frame = max_frames;
         }
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index f687580d3d..a4519e14b6 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -162,7 +162,6 @@ Session::Session (AudioEngine &eng,
 		
 	playlists.reset (new SessionPlaylists);
 
-        _all_route_group->set_edit (true);
         _all_route_group->set_active (true, this);
 
 	interpolation.add_channel_to (0, 0);