Switch back to allowing a setuptools build.. Apparently works now.?

Also, drop some dead code.