Updated maven dependencies and cleaup.