no more integrated python, some cleanup