#133 - removing commented-out code