Removed unused code (was already commented out)
Increased timeout value
Add tweaked build