Reverting some parts to make archives