Micro-cleanup