handle subscriber case and remove stale security hack