Loads of cleanup in image analysis