Index: libcfa/src/concurrency/actor.hfa
===================================================================
--- libcfa/src/concurrency/actor.hfa	(revision ca0c311012ec648cff08394473a39dae0292ec46)
+++ libcfa/src/concurrency/actor.hfa	(revision 2fd4cea308e6efe9323737cc2665e03050e6c8f8)
@@ -53,5 +53,4 @@
     message * msg;
     __receive_fn fn;
-    // bool stop; // commented from change to termination flag from sentinels C_TODO: remove after confirming no performance degradation
 };
 
@@ -59,7 +58,5 @@
     int m;
 };
-static inline void ?{}( request & this ) { 
-    // this.stop = true; // default ctor makes a sentinel
-}
+static inline void ?{}( request & this ) {}
 static inline void ?{}( request & this, actor * base_receiver, actor * receiver, message * base_msg, message * msg, __receive_fn fn ) {
     this.base_receiver = base_receiver;
@@ -68,5 +65,4 @@
     this.msg = msg;
     this.fn = fn;
-    // this.stop = false;
 }
 static inline void ?{}( request & this, request & copy ) {
@@ -74,5 +70,4 @@
     this.msg = copy.msg;
     this.fn = copy.fn;
-    // this.stop = copy.stop;
 }
 
@@ -97,5 +92,5 @@
 }
 
-static inline void insert( copy_queue & this, request & elem ) with(this) { // C_TODO: remove redundant send/insert once decision is made on emplace/copy
+static inline void insert( copy_queue & this, request & elem ) with(this) {
     if ( count >= buffer_size ) { // increase arr size
         last_size = buffer_size;
@@ -338,17 +333,4 @@
 
 static inline void ^?{}( executor & this ) with(this) {
-    // #ifdef __STEAL // commented from change to termination flag from sentinels C_TODO: remove after confirming no performance degradation
-    // request sentinels[nrqueues];
-    // for ( unsigned int i = 0; i < nrqueues; i++ ) {
-    //     insert( request_queues[i], sentinels[i] );		// force eventually termination
-    // } // for
-    // #else
-    // request sentinels[nworkers];
-    // unsigned int reqPerWorker = nrqueues / nworkers, extras = nrqueues % nworkers;
-    // for ( unsigned int i = 0, step = 0, range; i < nworkers; i += 1, step += range ) {
-    //     range = reqPerWorker + ( i < extras ? 1 : 0 );
-    //     insert( request_queues[step], sentinels[i] );		// force eventually termination
-    // } // for
-    // #endif
     is_shutdown = true;
 
@@ -614,5 +596,5 @@
         #ifdef __STEAL
         if ( is_empty( *current_queue ) ) {
-            if ( unlikely( no_steal ) ) { CHECK_TERMINATION; continue; } // C_TODO: if this impacts static/dynamic perf refactor check
+            if ( unlikely( no_steal ) ) { CHECK_TERMINATION; continue; }
             empty_count++;
             if ( empty_count < steal_threshold ) continue;
@@ -637,5 +619,4 @@
             &req = &remove( *current_queue );
             if ( !&req ) continue;
-            // if ( req.stop ) break Exit;
             deliver_request( req );
         }
@@ -679,9 +660,5 @@
 }
 
-// TODO: potentially revisit getting number of processors
-//  ( currently the value stored in active_cluster()->procs.total is often stale 
-//  and doesn't reflect how many procs are allocated )
-// static inline void start_actor_system() { start_actor_system( active_cluster()->procs.total ); }
-static inline void start_actor_system() { start_actor_system( 1 ); }
+static inline void start_actor_system() { start_actor_system( get_proc_count( *active_cluster() ) ); }
 
 static inline void start_actor_system( executor & this ) {
@@ -693,5 +670,5 @@
 
 static inline void stop_actor_system() {
-    park( ); // will receive signal when actor system is finished
+    park( ); // will be unparked when actor system is finished
 
     if ( !__actor_executor_passed ) delete( __actor_executor_ );