Clean-up as suggested by NetBeans