More cleanup for Netbeans