Increased timeout
Log change
Removed old if statement. No longer needed
Fixed state reset case
Getting rid of deprecated methods