Minor update. Removed commented out code