More maven clean ups in preparation for 10.3.0