Unrelated cleanup.