do we need the commented out code?