removed scotch and jpanel