Remove HBIRE assembly file, revert a trivial file diff