Standardised remove functionality (also system switching for future test modes).