Move non publisher stuff out.