Clean maven System a little bit