Remove more unnecessary steps

These three steps are unnecessary so we can simplify the reference algorithms.