Remove extraneous old stuff for PoC-7.
Fix gas remaining issue.