Removed debug logging
Code cleanup
Reliability improvements