Some cleanup and final prep before doing the output driver