Only assert the file hash matches the file if the payload is not encrypted
Tidy up rhizome extract return code
Re-add database cleanup
Refactor rhizome extract manifest into more useful methods