finishing, removed JOptionPanels