cleanup + uppg4