Simplify code for non-archiving algorithms