Cleanup, and remove autoupdate feature