This is an unrelated cleanup, right?