Fix the cleanup