Raised timeouts
Removed unused define