Why is this all commented out? It should be deleted or have a very clear comment explaining why it's still around.