choice menu builds correctly

choice menu now builds correctly.  also removed some commented out code.