sp: remove groundcontrol/selfalytic, add cirrus