cleanup
avoid maven plugin decoration, when not used
fixed combination of conditions