*Bug fixes*
- crash in prod when no sentry
- cleanup