Add a 60s timeout
Remove the no-op function call