Did some maven cleanup