Add ArchiveWriter callbacks
Remove commented out code