Remove sparkup.
Merge upstream.