This can also be cleaned up in the same way.