Re-enabled cleanup