More static analyis and POM cleanups