Clean maven dependencies & minor fixes