Various Maven cleanup