Cleanup

Maven cleanup