diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,10 @@
+# core
+setuptools==20.8.1
+setuptools-scm==1.11.0
+
 Babel==1.3
 Beaker==1.7.0
 Chameleon==2.24
-CProfileV==1.0.6
 FormEncode==1.2.4
 Jinja2==2.7.3
 Mako==1.0.1
@@ -13,47 +16,33 @@ PasteDeploy==1.5.2
 PasteScript==1.7.5
 Pygments==2.1.3
 pygments-markdown-lexer==0.1.0.dev39
-
 # TODO: This version is not available on PyPI
 # Pylons==1.0.2.dev20160108
 Pylons==1.0.1
-
-# TODO: This version is not available, but newer ones are
-# Pyro4==4.35
 Pyro4==4.41
-
-# TODO: This should probably not be in here
-# -e hg+https://johbo@code.rhodecode.com/johbo/rhodecode-fork@3a454bd1f17c0b2b2a951cf2b111e0320d7942a9#egg=RhodeCodeEnterprise-dev
-
 Routes==1.13
 SQLAlchemy==0.9.9
 Sphinx==1.2.2
 Tempita==0.5.2
 URLObject==2.4.0
 WebError==0.10.3
-
 # TODO: This is modified by us, needs a better integration. For now
 # using the latest version before.
 # WebHelpers==1.3.dev20150807
 WebHelpers==1.3
-
 WebHelpers2==2.0
 WebOb==1.3.1
 Whoosh==2.7.0
-alembic==0.8.4
 amqplib==1.0.2
 anyjson==0.3.3
 appenlight-client==0.6.14
 authomatic==0.1.0.post1;
 backport-ipaddress==0.1
-bottle==0.12.8
-bumpversion==0.5.3
 celery==2.2.10
 channelstream==0.5.2
 click==5.1
 colander==1.2
 configobj==5.0.6
-cssselect==0.9.1
 decorator==3.4.2
 deform==2.0a2
 docutils==0.12
@@ -63,24 +52,11 @@ dulwich==0.12.0
 ecdsa==0.11
 future==0.14.3
 futures==3.0.2
-gevent==1.1.1
-gprof2dot==2015.12.1
-greenlet==0.4.9
-gunicorn==19.6.0
-
-# TODO: Needs subvertpy and blows up without Subversion headers,
-# actually we should not need this for Enterprise at all.
-# hgsubversion==1.8.2
-
 gnureadline==6.3.3
 infrae.cache==1.0.1
-invoke==0.13.0
-ipdb==0.10.1
-ipython==5.1.0
 iso8601==0.1.11
 itsdangerous==0.24
 kombu==1.5.1
-lxml==3.4.4
 meld3==1.0.2
 msgpack-python==0.4.6
 nose==1.3.6
@@ -107,36 +83,48 @@ python-memcached==1.57
 python-pam==1.8.2
 pytz==2015.4
 pyzmq==14.6.0
-
-# TODO: This is not available in public
-# rc-testdata==0.2.0
-
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.10.2.zip#md5=d2af3985a1a32a678944d4d48870cb04
-
-
 recaptcha-client==1.0.6
 repoze.lru==0.6
 requests==2.9.1
 serpent==1.12
 setproctitle==1.1.8
-setuptools==20.8.1
-setuptools-scm==1.11.0
 simplejson==3.7.2
 six==1.9.0
 subprocess32==3.2.6
 supervisor==3.3.0
-transifex-client==0.10
+
 translationstring==1.3
 trollius==1.0.4
 uWSGI==2.0.11.2
 urllib3==1.16
 venusian==1.0
-waitress==0.8.9
+
 wsgiref==0.1.2
 zope.cachedescriptors==4.0.0
 zope.deprecation==4.1.2
 zope.event==4.0.3
 zope.interface==4.1.3
 
+# cli tools
+alembic==0.8.4
+invoke==0.13.0
+bumpversion==0.5.3
+transifex-client==0.10
+
+# http servers
+gevent==1.1.1
+greenlet==0.4.9
+gunicorn==19.6.0
+waitress==0.8.9
+
+# debug
+ipdb==0.10.1
+ipython==5.1.0
+CProfileV==1.0.6
+bottle==0.12.8
+
+# rhodecode-tools
+https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.10.2.zip#md5=d2af3985a1a32a678944d4d48870cb04
+
 # test related requirements
 -r requirements_test.txt