Removing cruft + migrating image-util into plugin