Remove (cleanup) comment outed code
Bug fix for npos=0 data that is always skip on queue
Fix a bug that npos=0 data always ignored for queue
Refactor and clean code up