Matt: This seems like it's not needed.