How come we're keeping this code commented out? Why not just remove?