Remove empty message check, remove netbeans autogenerated comments