persist type selection & cleanup