- Simplify some conditions in machine probe
- Remove error logs from keys controller