Remove Network monitor and Upgrade manager. (And small recipe tweak)