diff --git a/client/mythread.cpp b/client/mythread.cpp
deleted file mode 100644
index 69fe660..0000000
--- a/client/mythread.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "mythread.h"
-
- void MyThread::run()
- {
-	 int i, j;
-
-	 for (i=0; i<NumPorts; i++)
-		 for (j=0; j<NumStats; j++)
-			 stats[i][j] = 0;
-	qDebug("after stats init\n");
-	 while (1)
-	 {
-		 for (i=0; i<NumPorts; i++)
-		 {
-			emit portStatsUpdate(i, (void*) &stats[i]);
-
-			for (j=0; j<NumStats; j++)
-				stats[i][j]+= qrand() & 0xF;
-
-		 }
-		sleep(qrand() & 0x3);
-	 }
- } 
-
diff --git a/client/mythread.h b/client/mythread.h
deleted file mode 100644
index 51bffc2..0000000
--- a/client/mythread.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _MY_THREAD_H
-#define _MY_THREAD_H
-
-#include <QThread>
-
-#define	NumPorts	2
-#define NumStats	8
-
- class MyThread : public QThread
- {
-	 Q_OBJECT
-
- public:
-     void run();
-
- signals:
-	 void portStatsUpdate(int port, void *stats);
-		 
- private:
-	 int stats[2][8];
- };
-
-#endif
diff --git a/client/ostinato.pro b/client/ostinato.pro
index aceb998..07dcdc0 100644
--- a/client/ostinato.pro
+++ b/client/ostinato.pro
@@ -6,7 +6,6 @@ HEADERS += \
 	dumpview.h \
 	hexlineedit.h \
 	mainwindow.h \
-	mythread.h \
 	packetmodel.h \
 	port.h \
 	portgroup.h \
diff --git a/client/portgrouplistmodel.h b/client/portgrouplistmodel.h
deleted file mode 100644
index 4242539..0000000
--- a/client/portgrouplistmodel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef _PORT_GROUP_LIST_H
-#define _PORT_GROUP_LIST_H
-
-#include "portgroup.h"
-#include <QAbstractItemModel>
-
-/* -----------------------------------------------------------
-** NOTE: FILE NOT USED 'COZ MOC DOESN'T SUPPORT NESTED CLASSES
-*-------------------------------------------------------------*/
-
-
-class PortGroupList;
-
-class PortGroupList : public QObject {
-
-	Q_OBJECT
-
-	class PortListModel : public QAbstractItemModel
-	{
-		// This is currently a read only model
-		Q_OBJECT
-
-		PortGroupList	*pgl;	// FIXME(HIGH): rename member
-
-		public:
-			PortListModel(PortGroupList *p, QObject *parent = 0);
-
-			int rowCount(const QModelIndex &parent = QModelIndex()) const;
-			int columnCount(const QModelIndex &parent = QModelIndex()) const;
-			Qt::ItemFlags flags(const QModelIndex &index) const;
-			QVariant data(const QModelIndex &index, int role) const;
-			QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-			QModelIndex index (int row, int col, const QModelIndex & parent = QModelIndex() ) const;
-			QModelIndex parent(const QModelIndex &index) const;	
-
-		friend class PortGroupList; // FIXME(MED): Review need for friend
-	};
-
-	friend class PortListModel;
-
-	QList<PortGroup*>	mPortGroups;	
-	PortListModel		mPortGroupListModel;
-
-// Methods
-public:
-	PortGroupList::PortGroupList();
-	QAbstractItemModel* getModel();
-	int addPortGroup(PortGroup &portGroup);
-	int removePortGroup(PortGroup &portGroup);
-
-private slots:
-	void when_portlist_dataChanged();
-};
-
-#endif
diff --git a/client/portlistmodel.cpp b/client/portlistmodel.cpp
deleted file mode 100644
index df53fb9..0000000
--- a/client/portlistmodel.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#include "portlistmodel.h"
-
------------------------
-This file is not used
------------------------
-
-PortListModel::PortListModel(QObject *parent)
-	: QAbstractItemModel(parent) 
-{
-	portList = new QList<PortGroup>;
-
-#if 0 // FIXME: Dummy data only for testing; to be removed
-	PortGroup	pg;
-
-	pg.name = "A";
-	pg.isLocal = TRUE;
-	pg.numPorts = 3;
-	pg.port = new Port[pg.numPorts];
-	pg.port[0].portId = 0;
-	pg.port[0].name = "A0";
-	pg.port[0].desc = "a0a0a0a0a0a0";
-	pg.port[1].portId = 1;
-	pg.port[1].name = "A1";
-	pg.port[1].desc = "a1a1a1a1a1a1";
-	pg.port[2].portId = 2;
-	pg.port[2].name = "A2";
-	pg.port[2].desc = "a2a2a2a2a2a2";
-
-	portList->append(pg);
-
-	pg.name = "B";
-	pg.isLocal = FALSE;
-	pg.numPorts = 2;
-	pg.port = new Port[pg.numPorts];
-	pg.port[0].portId = 0;
-	pg.port[0].name = "B0";
-	pg.port[0].desc = "b0b0b0b0b0b0";
-	pg.port[1].portId = 1;
-	pg.port[1].name = "B1";
-	pg.port[1].desc = "b1b1b1b1b1b1";
-
-	portList->append(pg);
-#endif
-	// Do I need to do anything here?
-}
-
-int PortListModel::rowCount(const QModelIndex &parent) const
-{
-	// qDebug("RowCount Enter\n");
-	if (!parent.isValid())
-	{
-		// Top Level Item
-		// qDebug("RowCount top\n");
-		// qDebug("RowCount Exit: %d\n", portList->size());
-		return portList->size();
-	}
-		// qDebug("RowCount non top %d, %d, %llx\n", 
-		// 	parent.row(), parent.column(), parent.internalId());
-
-	quint16 p = parent.internalId() & 0xFFFF;
-	if (p == 0xFFFF)
-	{
-		// qDebug("RowCount Exit: %d\n", portList->at(parent.row()).numPorts);
-	return portList->at(parent.row()).numPorts;
-	}
-	else
-	{
-		// Leaf Item
-		return 0;
-	}
-}
-
-int PortListModel::columnCount(const QModelIndex &parent ) const
-{
-	return 1;	// FIXME: hardcoding
-}
-
-Qt::ItemFlags PortListModel::flags(const QModelIndex &index) const
-{
-	return QAbstractItemModel::flags(index); // FIXME: no need for this func
-}
-QVariant PortListModel::data(const QModelIndex &index, int role) const
-{
-	//qDebug("Enter PortListModel data\n");
-	// Check for a valid index
-	if (!index.isValid())
-		return QVariant();
-
-
-	// Check role
-	if ((role == Qt::DisplayRole))
-	{
-#if 0 // Only for debug
-		qDebug("Exit PortListModel data\n");
-		return "Testing"; // FIXME: for dbg only
-#endif
-
-		QModelIndex	parent = index.parent();
-
-		if (!parent.isValid())
-		{
-			// Top Level Item
-			return QString("%1 (%2) [%3]").
-				arg(portList->at(index.row()).name).
-				arg(portList->at(index.row()).isLocal == TRUE? "LOCAL" : "REMOTE").
-				arg(portList->at(index.row()).numPorts); 
-		}
-		return QString("%1: %2 (%3)").
-			arg(portList->at(parent.row()).port[index.row()].portId).
-			arg(portList->at(parent.row()).port[index.row()].name).
-			arg(portList->at(parent.row()).port[index.row()].desc);
-	}
-	else
-		return QVariant();
-}
-
-QVariant PortListModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	if (role != Qt::DisplayRole)
-		return QVariant();
-
-	if (orientation == Qt::Horizontal)
-		return QVariant();
-	else
-		return QString("%1").arg(section+1);
-}
-
-QModelIndex PortListModel::index (int row, int col, 
-	const QModelIndex & parent) const
-{
-#if 0
-	if (!hasIndex(row, col, parent))
-		return QModelIndex();
-#endif
-	
-	//qDebug("index: R=%d, C=%d, PR=%d, PC=%d, PID=%llx\n",
-	//	row, col, parent.row(), parent.column(), parent.internalId());
-
-	if (!parent.isValid())
-	{
-		// Top Level Item
-		quint16 pg = row, p = 0xFFFF;
-		quint32 id = (pg << 16) | p;
-		//qDebug("index (top) dbg: PG=%d, P=%d, ID=%x\n", pg, p, id);
-
-		return createIndex(row, col, id);
-	}
-	else
-	{
-		quint16 pg = parent.row(), p = row;
-		quint32 id = (pg << 16) | p;
-		//qDebug("index (nontop) dbg: PG=%d, P=%d, ID=%x\n", pg, p, id);
-
-		return createIndex(row, col, id);
-	}
-}
-
-QModelIndex PortListModel::parent(const QModelIndex &index) const
-{
-	if (!index.isValid())
-		return QModelIndex();
-	
-	//qDebug("parent: R=%d, C=%d ID=%llx\n",
-	//	index.row(), index.column(), index.internalId());
-
-	quint16 pg = index.internalId() >> 16;
-	quint16 p = index.internalId() & 0x0000FFFF;
-
-	//qDebug("parent dbg: PG=%d, P=%d\n", pg, p);
-
-	if (p == 0xFFFF)
-	{
-		//qDebug("parent ret: NULL\n");
-		// Top Level Item - PG
-		return QModelIndex();
-	}
-
-	quint32 id = (pg << 16) | 0xFFFF;
-	//qDebug("parent ret: R=%d, C=%d, ID=%x\n",
-	//	pg, 0, id);
-
-	return createIndex(pg, 0, id);
-
-}
-
-void PortListModel::doRefresh()
-{
-	emit layoutChanged();
-}
-
-
diff --git a/client/portlistmodel.h b/client/portlistmodel.h
deleted file mode 100644
index 45a07bc..0000000
--- a/client/portlistmodel.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _PORT_LIST_MODEL_H
-#define _PORT_LIST_MODEL_H
-
-
- -----------------
- This file is not used
- ------------------
-
-#include <QAbstractItemModel>
-#include <QStringList>
-#include "portgroup.h"
-
-static QStringList PortListCols = (QStringList()
-	<< "Name"
-);
-
-class PortListModel : public QAbstractItemModel
-{
-	Q_OBJECT
-
-	public:
-		//PortListModel(QObject *parent = 0) : QAbstractItemModel(parent) {}
-		PortListModel(QObject *parent = 0);
-
-		int rowCount(const QModelIndex &parent = QModelIndex()) const;
-		int columnCount(const QModelIndex &parent = QModelIndex()) const;
-		Qt::ItemFlags flags(const QModelIndex &index) const;
-		QVariant data(const QModelIndex &index, int role) const;
-		QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-		QModelIndex index (int row, int col, const QModelIndex & parent = QModelIndex() ) const;
-		QModelIndex parent(const QModelIndex &index) const;	
-
-		void doRefresh();	// FIXME: temp till model exports functions to insert rows
-		QList<PortGroup>	*portList; // FIXME: this shd be private
-};
-
-#endif
diff --git a/client/streamlistmodel.cpp b/client/streamlistmodel.cpp
deleted file mode 100644
index 9812720..0000000
--- a/client/streamlistmodel.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "streamlistmodel.h"
-
-StreamListModel::StreamListModel(QObject *parent)
-	: QAbstractTableModel(parent) 
-{
-	uint i;
-
-	// Enable all streams by default
-	for (i=0; i<MAX_ROWS; i++)
-	{
-		streamList[i].isEnabled = true;
-	}
-}
-
-int StreamListModel::rowCount(const QModelIndex &parent) const
-{
-	return MAX_ROWS;	// FIXME
-}
-
-int StreamListModel::columnCount(const QModelIndex &parent ) const
-{
-	return MAX_COLS;	// FIXME
-}
-
-Qt::ItemFlags StreamListModel::flags(const QModelIndex &index) const
-{
-	Qt::ItemFlags	flags = QAbstractTableModel::flags(index);
-
-	if (index.column() == 0)
-		;
-	else if (index.column() == 1)
-		flags |= Qt::ItemIsEditable;
-	else if (index.column() == 2)
-		flags |= Qt::ItemIsUserCheckable | Qt::ItemIsEditable;
-
-	return flags;
-}
-QVariant StreamListModel::data(const QModelIndex &index, int role) const
-{
-	// Check for a valid index
-	if (!index.isValid())
-		return QVariant();
-
-	// Check for row/column limits
-	if (index.row() >= MAX_ROWS)
-		return QVariant();
-
-	if (index.column() >= MAX_COLS)
-		return QVariant();
-
-	// Check role
-	if (index.column() == 0) // Icon
-	{
-		if ((role == Qt::DisplayRole))
-			return QString("EDIT");
-		else
-			return QVariant();
-	}
-	else if (index.column() == 1) // Name
-	{
-		if ((role == Qt::DisplayRole) || (role == Qt::EditRole))
-			return streamList[index.row()].streamName;
-		else
-			return QVariant();
-	}
-	else if (index.column() == 2) // Enabled?
-	{
-		//if ((role == Qt::CheckStateRole) || (role == Qt::EditRole))
-			// return streamList[index.row()].isEnabled ? Qt::Checked : Qt::Unchecked;
-		if ((role == Qt::DisplayRole) || (role == Qt::EditRole))
-			return streamList[index.row()].isEnabled;
-		else
-			return QVariant();
-	}
-}
-
-bool StreamListModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-	if (index.isValid() && role == Qt::EditRole) 
-	{
-		if (index.column() == 1) // Name
-			streamList[index.row()].streamName = value.toString();
-		else if (index.column() == 2) // Enabled?
-			streamList[index.row()].isEnabled = value.toBool();
-		else
-			return false;
-
-		return true;
-	}
-	return false;
-}
-
-QVariant StreamListModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	if (role != Qt::DisplayRole)
-		return QVariant();
-
-	if (orientation == Qt::Horizontal)
-		return StreamListCols.at(section);
-	else
-		return QString("%1").arg(section+1);
-}
-
-#if 0
-// QModelIndex StreamListModel::index (int portNum, PortStat stat, const QModelIndex & parent = QModelIndex() ) const
-
-void StreamListModel::on_portStatsUpdate(int port, void*stats)
-{
-	int i;
-	QModelIndex topLeft = index(port, 0, QModelIndex());
-	QModelIndex bottomRight = index(port, e_STAT_MAX, QModelIndex());
-
-	for (i = 0; i < e_STAT_MAX; i++)
-		dummyStats[port][i] = ((int *)stats)[i];
-
-	emit dataChanged(topLeft, bottomRight);
-}
-
-#endif
diff --git a/client/streamlistmodel.h b/client/streamlistmodel.h
deleted file mode 100644
index 54c222b..0000000
--- a/client/streamlistmodel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _STREAM_LIST_MODEL_H
-#define _STREAM_LIST_MODEL_H
-
-#include <QAbstractTableModel>
-#include <QStringList>
-
-static QStringList StreamListCols = (QStringList()
-	<< "Icon"
-	<< "Name"
-	<< "Enable"
-);
-
-#define MAX_ROWS	5
-#define MAX_COLS	3
-
-class StreamListModel : public QAbstractTableModel
-{
-	Q_OBJECT
-
-	public:
-		//StreamListModel(QObject *parent = 0) : QAbstractTableModel(parent) {}
-		StreamListModel(QObject *parent = 0);
-
-		int rowCount(const QModelIndex &parent = QModelIndex()) const;
-		int columnCount(const QModelIndex &parent = QModelIndex()) const;
-		Qt::ItemFlags flags(const QModelIndex &index) const;
-		QVariant data(const QModelIndex &index, int role) const;
-		bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
-		QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-		// QModelIndex index (int portNum, PortStat stat, const QModelIndex & parent = QModelIndex() ) const;
-
-	public slots:
-//		void on_portStatsUpdate(int port, void*stats);
-
-	private:
-		// FIXME: temp
-//#define NUM_PORTS		2
-//		int dummyStats[NUM_PORTS][e_STAT_MAX];
-		struct {
-			QString		streamName;
-			bool		isEnabled;
-		} streamList[MAX_ROWS];
-
-};
-
-#endif