Cleanup of  Netbeans warnings