And remove stupidly added virtualenv stuff