can all this commented out code be removed?