Maven build now completes. Started cleanup of new code.