If we're going to comment this out, think we can remove it all together?