This is commented out, should it be removed?