Refactoring - function simplification
Remove archived entry