Remove pip2whl, fix wheel dependency issues