Cleaning up Sunspot stuff.