clean up for incoming major change
fix multi-request issue, and fix problem of running with C++ extension