Remove python-pip dependency and more refactorying of build steps