Re-enable cleanup