Update PhantomJS to 1.9.8 + clean-up code