Cleanup crab stuff to avoid input payload increase, merge latest from giovanni #646

Closed arizzi closed 7 years ago