Remove url from setup
Revamped for 2.0 release