Cleanup for subsystem removal