2.2 merge maven cleanup