Removing redundant code
Continuing to rework the way routes are handled