More remove of PhantomJS + other cleanup