Upgraded Maven plugins, removed plugin plugins as no more needed