remove a bunch of ad-hoc code to simplify instructions from