archive: cleaning hacks for lazy