maven improvements and clean up