clean up the publisher stuff some more