Fixed entry points in setup.py

Also removed some old code