Remove hardcoded timeouts