ARGO-340: remove the expedite buttons, expedite display info, and underl...

...ying machinery for expediting