diff --git a/MANIFEST.in b/MANIFEST.in
index cb38c48..4506cce 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include HISTORY.rst README.rst tabbed LICENSE AUTHORS 
\ No newline at end of file
+include HISTORY.rst README.rst LICENSE AUTHORS 
\ No newline at end of file
diff --git a/tabbed b/tabbed
deleted file mode 100755
index c30ec36..0000000
--- a/tabbed
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""
-Tabbed -- CLI for Tablib
-Copyright (c) 2010 Kenneth Reitz. MIT License.
-"""
-
-import tablib.cli
-
-
-if __name__ == '__main__':
-	
-	tablib.cli.start()
\ No newline at end of file
diff --git a/tablib/cli.py b/tablib/cli.py
deleted file mode 100644
index 94920ee..0000000
--- a/tablib/cli.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-
-""" Tabbed CLI Inteface Application
-"""
-
-import io
-import sys
-
-from helpers import *
-import tablib.core
-
-from packages import opster
-
-
-FORMATS = ('json', 'yaml', 'xls', 'csv', 'html')
-
-opts = []
-
-opts.append(('v', 'version', False, 'Report tabbed version'))
-
-for format in FORMATS:
-	opts.append(('', format, False, 'Output to %s' % (format.upper())))
-
-
-
-@opster.command(options=opts, usage='[FILE] [--FORMAT | FILE]')
-def start(in_file=None, out_file=None, **opts):
-	"""Covertly convert dataset formats"""
-	
-	opts = Struct(**opts)
-	
-	if opts.version:
-		print('Tabbed, Ver. %s' % tabbed.core.__version__)
-		sys.sys.exit(0)
-	
-	stdin = piped()
-	
-	if stdin:
-		print stdin
-	
-	elif in_file:
-		
-		try:
-			in_file = io.open(in_file, 'r')
-		except Exception, e:
-			print(' %s cannot be read.' % in_file)
-			sys.exit(65)
-		
-		file_ext = in_file.name.split('.')[-1]
-		
-		if file_ext.lower() in FORMATS:
-			setattr(opts, file_ext, True)
-		else:
-			print('Import format not supported.')
-			sys.exit(65)
-	else:
-		print('Please provide input.')
-		sys.exit(65)
-		
-
-	
-	_formats_sum = sum(opts[f] for f in FORMATS)
-	
-	# Multiple output formats given
-	if _formats_sum > 1:
-		print('Please specify a single output format.')
-		sys.exit(64)
-		
-	# No output formats given
-	elif _formats_sum < 1:
-		print('Please specify an output format.')
-		sys.exit(64)
-	
-	
-	# fetch options.formats list
-	# if sum(()) > 1
-	# log only one data format please
-	# if sum of formats == 0, specity format
-	
-	# look for filename
-	
-	print opts.__dict__
-	print in_file
-	print out_file
\ No newline at end of file