Cleanup
Leave out virtualenv stuff