- cleanup, added python2/python3 bconds