maven clean up and enhance