Merged manuscript_cleanup