remove throttle code
add fields
Merge branch 'no-throttle'