Clean up content for clientserver edition