remove hardcoded limits