remove hardcoded timeout