Clean-up of setup for proper conda building.