maven fix&clean up