Seems unnecessary. Could we clean this up?