remove alerts
Merge branch 'feature-client-detect' into develop