[UP] Mini-clean