Removed unused code from other folks, and tweak setup.py script.