First pass cleanup, removing most addons