Removed cluttered stuff

* use only internal modules