remove obsolete pieces
add archived stuff