We could do with removing the following swathe of commented-out code