diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 0000000000..fb1d13fb75
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,34 @@
+JPL Contributors to the F` Software Framework:
+
+* Adams, Derek
+* Bocchino, Robert
+* Campuzano, Brian
+* Canham, Timothy
+* Chase, Matthew
+* Chen, Victor
+* Day, Leonard
+* Dinkle, Kevin
+* Gandhi, Gorang
+* Hofman, James
+* Kooi, David
+* Klemm, Rogers
+* Kubiak, Gerak
+* Levison, Jeffrey
+* Manglapus, Lloyd
+* Merewether, Eugene
+* Nicolich, Eric
+* Nowicki, Robert
+* Ortega, Kevin
+* Pandian, Prashanth 
+* Reder, Leonard
+* Rizvi, Aadil
+* Roche, Michael
+* Sinha, Sanchit
+* Starch, Michael
+* Perez, Joseph
+* Shenker, Boris
+* Tuszynski, Marek
+* Uchenik, Igor
+* Watney, Garth
+* Wang, Eric
+* Wong, Vincent
diff --git a/Ref/Top/Topology.cpp b/Ref/Top/Topology.cpp
index e015e2b33e..aa938377ef 100644
--- a/Ref/Top/Topology.cpp
+++ b/Ref/Top/Topology.cpp
@@ -398,16 +398,9 @@ void print_usage() {
 }
 
 
-#if defined TGT_OS_TYPE_LINUX || TGT_OS_TYPE_DARWIN
-
-//#include <mqueue.h>
 #include <signal.h>
 #include <stdio.h>
 
-extern "C" {
-    int main(int argc, char* argv[]);
-};
-
 volatile sig_atomic_t terminate = 0;
 
 static void sighandler(int signum) {
@@ -415,11 +408,6 @@ static void sighandler(int signum) {
 }
 
 int main(int argc, char* argv[]) {
-//    mq_unlink("/QP_1KhzRateGroup");
-//    mq_unlink("/QP_100hzRateGroup");
-//    mq_unlink("/QP_1hzRateGroup");
-//    mq_unlink("/QP_CmdComponent");
-//    return 0;
 	U32 port_number;
 	I32 option;
 	char *hostname;
@@ -473,75 +461,3 @@ int main(int argc, char* argv[]) {
 
     return 0;
 }
-
-#endif
-
-#ifdef TGT_OS_TYPE_VXWORKS
-
-#include "Fw/Types/VxWorks/VxWorksLogAssert.hpp"
-
-extern "C" {
-    void go(int portNum, char* hostname);
-}
-
-void cycleTask(void* arg) {
-    runcycles(-1);
-}
-
-Os::Task cycleTaskObj;
-
-Fw::VxWorksLogAssertHook logAssertHook;
-
-void go(int portNum, char* hostname) {
-    logAssertHook.registerHook();
-    constructApp(portNum,hostname);
-    // start thread cycling
-    Fw::EightyCharString taskName("Cycler");
-    if (cycleTaskObj.start(taskName,CYCLER_TASK,160, 10*1024,cycleTask,0) != Os::Task::TASK_OK) {
-        printf("Failed to start cycler task!\n");
-    }
-
-    Os::Task::delay(10000);
-}
-
-#endif
-
-#ifdef TGT_OS_TYPE_RTEMS
-
-#include <stdio.h>
-#include <rtems/rtems_config.h>
-
-
-rtems_task Init (rtems_task_argument ignored) {
-
-    (void) printf("Constructing Architecture\n");
-
-    // *** Probably broken. Hasn't been tested in a few releases ***
-
-    constructApp();
-
-    int cycle = 0;
-
-    while (cycle != 10) {
-        Os::Task::delay(1000);
-        (void) printf("Cycle %d\n",cycle);
-        runcycles(1);
-        cycle++;
-    }
-
-    // stop tasks
-    rateGroup1KhzComp.exit();
-    rateGroup100hzComp.exit();
-    rateGroup1hzComp.exit();
-    blockDrv.exit();
-
-    // Give time for threads to exit
-    (void) printf("Waiting for threads...\n");
-    Os::Task::delay(1000);
-
-    (void) printf("Exiting...\n");
-    exit(0);
-}
-
-#endif
-