More maven cleanup