Fix commented out code