Nice clean up in this file. You can remove `xit` since it is not used in this file.