cleaned up and made Maven build optional