remove redundancy
add timeout configuration option, now set to 1 minute