Post-fix cleanup