Update cleanup to just remove directory, not individual files